Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update mcontext_t definition on musl, add fpstate struct #1646

Closed
wants to merge 1 commit into from

Conversation

MarkMcCaskey
Copy link

@MarkMcCaskey MarkMcCaskey commented Jan 24, 2020

Hello! This PR updates definitions for x86_64 in musl to match the GNU ones and the current musl headers:

Relevant links for review:

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @gnzlbg (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@MarkMcCaskey
Copy link
Author

Hmm, I'm not sure why the tests are failing,

also the comment on mcontext on the musl side,

    // GitHub repo: ifduyue/musl/
    // commit: b4b1e10364c8737a632be61582e05a8d3acf5690
    // file: arch/x86_64/bits/signal.h#L80-L84

is probably out of date now. Is that comment being parsed and used for testing? 🤔

bors bot added a commit to wasmerio/wasmer that referenced this pull request Jan 28, 2020
1180: Fix compilation for target `x86_64-unknown-linux-musl`. r=losfair a=losfair

Fixes compilation failure when built for `x86_64-unknown-linux-musl`.

- Allows disabling the `wabt` feature to avoid depending on a C++ compiler.
- Disables XMM register dump on fault as a workaround for missing musl libc types (rust-lang/libc#1646).

Fixes #1178 and #1173 .

Co-authored-by: losfair <zhy20000919@hotmail.com>
@bors
Copy link
Contributor

bors commented Feb 28, 2020

☔ The latest upstream changes (presumably #1649) made this pull request unmergeable. Please resolve the merge conflicts.

@JohnTitor
Copy link
Member

@MarkMcCaskey Could you rebase to check CI?
r? @JohnTitor

@JohnTitor
Copy link
Member

I'm not sure if we could apply the same way as GNU since musl does a different way. At least, I think _libc_fpstate should be fpregset_t here.

@JohnTitor
Copy link
Member

I'm going to close this as inactive. Feel free to re-open if you have some time to resolve the above comment, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants